Merge git://git.denx.de/u-boot-usb
authorTom Rini <[email protected]>
Fri, 16 Feb 2018 18:55:41 +0000 (13:55 -0500)
committerTom Rini <[email protected]>
Fri, 16 Feb 2018 18:55:41 +0000 (13:55 -0500)

Trivial merge